Fix windows 10 problems